Rename motion.object_id -> motion.motion_id
merge