diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java
index 6e31be051..436b46c8b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoPropertyDescriptors.java
@@ -130,10 +130,7 @@ public class MongoPropertyDescriptors implements Iterable<MongoPropertyDescripto
 		 * @return
 		 */
 		public boolean isOfIdType() {
-			boolean isString = String.class.isAssignableFrom(getPropertyType());
-			boolean isObjectId = ObjectId.class.isAssignableFrom(getPropertyType());
-			boolean isBigInteger = BigInteger.class.isAssignableFrom(getPropertyType());
-			return isString || isObjectId || isBigInteger;
+			return SUPPORTED_ID_CLASSES.contains(delegate.getPropertyType());
 		}
 
 		/**