Rahja, when he starts crawling you could get a bed rail. I used that for quite some time, although I did transfer DD into her cot after she crawled out of bed once :-(
She still joins us in the early morning, some time between 5am and 6:30am and I love those cuddles. Plus it has the added bonus of another hour or 2 of sleep.