Add ObjectId to variants for cleaner reference