Are you on the edge of being able to afford what you want? If so, I would personally lock.
Are you planning on staying there for a long time? If not I'd look at 7 10 or 15 year ARMs. I just locked a 7-year at 3.125%.
And if so, I'd buy down the rate if you can afford it.