Don't convert id property to ObjectId if type is a String

Don't convert id property to ObjectId if type is a String