diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index b609c1b45..558ac48be 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -116,22 +116,22 @@ namespace BlackMisc
 
         //! Operator == with CValueObject
         //! \todo Still needed?
-        template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+        template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
         friend bool operator ==(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap == CVariant::from(valueObject); }
 
         //! Operator != with CValueObject
         //! \todo Still needed?
-        template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+        template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
         friend bool operator !=(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap != CVariant::from(valueObject); }
 
         //! Operator == with CValueObject
         //! \todo Still needed?
-        template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+        template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
         friend bool operator ==(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap == CVariant::from(valueObject); }
 
         //! Operator != with CValueObject
         //! \todo Still needed?
-        template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+        template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
         friend bool operator !=(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap != CVariant::from(valueObject); }
 
         //! Map
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index 96613982c..864659eca 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -239,7 +239,7 @@ namespace BlackMisc
     };
 
     //! Compare stored value of CVariant with any CValueObject derived class.
-    template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+    template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
     bool operator ==(const T &value, const CVariant &variant)
     {
         if (variant.canConvert<T>()) { return variant.value<T>() == value; }
@@ -247,21 +247,21 @@ namespace BlackMisc
     }
 
     //! Compare stored value of CVariant with any CValueObject derived class.
-    template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+    template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
     bool operator !=(const T &value, const CVariant &variant)
     {
         return !(value == variant);
     }
 
     //! Compare stored value of CVariant with any CValueObject derived class.
-    template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+    template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
     bool operator ==(const CVariant &variant, const T &value)
     {
         return value == variant;
     }
 
     //! Compare stored value of CVariant with any CValueObject derived class.
-    template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type>
+    template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
     bool operator !=(const CVariant &variant, const T &value)
     {
         return !(value == variant);