diff --git a/flight/UAVObjects/inc/uavobjecttemplate.h b/flight/UAVObjects/inc/uavobjecttemplate.h
index 4fa977296..5b15a5a84 100644
--- a/flight/UAVObjects/inc/uavobjecttemplate.h
+++ b/flight/UAVObjects/inc/uavobjecttemplate.h
@@ -41,7 +41,7 @@
 #define $(NAMEUC)_H
 
 // Object constants
-#define $(NAMEUC)_OBJID $(OBJID)U
+#define $(NAMEUC)_OBJID $(OBJIDHEX)
 #define $(NAMEUC)_NAME "$(NAME)"
 #define $(NAMEUC)_METANAME "$(NAME)Meta"
 #define $(NAMEUC)_ISSINGLEINST $(ISSINGLEINST)
diff --git a/ground/src/plugins/uavobjects/uavobjecttemplate.h b/ground/src/plugins/uavobjects/uavobjecttemplate.h
index 5df99c975..8149b4774 100644
--- a/ground/src/plugins/uavobjects/uavobjecttemplate.h
+++ b/ground/src/plugins/uavobjects/uavobjecttemplate.h
@@ -50,7 +50,7 @@ $(DATAFIELDS)
 $(DATAFIELDINFO)
   
     // Constants
-    static const quint32 OBJID = $(OBJID)U;
+    static const quint32 OBJID = $(OBJIDHEX);
     static const QString NAME;
     static const QString DESCRIPTION;
     static const bool ISSINGLEINST = $(ISSINGLEINST);