Refactor to ObjectId