Switched some common objects to the new object manager.