diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/Endpoint.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/Endpoint.java
index 2ac50df..0ee9af2 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/Endpoint.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/Endpoint.java
@@ -69,7 +69,7 @@
             return false;
         }
         Endpoint that = (Endpoint) obj;
-        return Objects.equals(this.port, that.port) &&
+        return this.port == that.port &&
                Objects.equals(this.ip, that.ip);
     }
 }
diff --git a/utils/misc/src/main/java/org/onlab/util/Match.java b/utils/misc/src/main/java/org/onlab/util/Match.java
index 295e558..ab26b8a 100644
--- a/utils/misc/src/main/java/org/onlab/util/Match.java
+++ b/utils/misc/src/main/java/org/onlab/util/Match.java
@@ -141,9 +141,9 @@
             return false;
         }
         Match<T> that = (Match<T>) other;
-        return Objects.equals(this.matchAny, that.matchAny) &&
+        return this.matchAny == that.matchAny &&
                Objects.equals(this.value, that.value) &&
-               Objects.equals(this.negation, that.negation);
+               this.negation == that.negation;
     }
 
     @Override