Using the new ObjectIdField when appropriate.