Add todo around object id generation