Re-apply change of User.id to User.m_id
Re-apply change of User.id to User.m_id

This was accidentally reverted in ce2f2af. The change was intially
introduced in 6a99e4c.

CS326-important/space-deer,CS326-important/space-deer