I'd use a nice organic baby cream. Ecostore and Miessence are lovely (Miessence is $$$ though). I don't like the baby looking oily and like it's about to be popped into the oven!

I only ever use olive oil for cooking so smelling it on the baby just seems wrong to me.