diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id b/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id
index 7ff75b2..66303f4 100644
--- a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id
+++ b/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id
@@ -1 +1 @@
-return require('gluon.sysconfig').primary_mac:gsub(':', '')
+return require('gluon.util').node_id()
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id b/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id
index 7ff75b2..66303f4 100644
--- a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id
+++ b/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id
@@ -1 +1 @@
-return require('gluon.sysconfig').primary_mac:gsub(':', '')
+return require('gluon.util').node_id()
diff --git a/gluon/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system b/gluon/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system
index 27b052c..bf5d781 100755
--- a/gluon/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system
+++ b/gluon/gluon-core/files/lib/gluon/upgrade/core/initial/010-gluon-system
@@ -1,13 +1,13 @@
 #!/usr/bin/lua
 
 local site = require 'gluon.site_config'
-local sysconfig = require 'gluon.sysconfig'
+local util = require 'gluon.util'
 local uci = require 'luci.model.uci'
 
 local c = uci.cursor()
 local system = c:get_first('system', 'system')
 
-c:set('system', system, 'hostname', site.hostname_prefix .. '-' .. string.gsub(sysconfig.primary_mac, ':', ''))
+c:set('system', system, 'hostname', site.hostname_prefix .. '-' .. util.node_id())
 c:set('system', system, 'timezone', site.timezone)
 
 c:save('system')
diff --git a/gluon/gluon-core/files/usr/lib/lua/gluon/util.lua b/gluon/gluon-core/files/usr/lib/lua/gluon/util.lua
index 8bfc8cd..4c06773 100644
--- a/gluon/gluon-core/files/usr/lib/lua/gluon/util.lua
+++ b/gluon/gluon-core/files/usr/lib/lua/gluon/util.lua
@@ -25,6 +25,7 @@ end
 
 local os = os
 local string = string
+local require = require
 
 module 'gluon.util'
 
@@ -50,3 +51,8 @@ end
 function unlock(file)
 	exec('lock', '-u', file)
 end
+
+function node_id()
+  local sysconfig = require 'gluon.sysconfig'
+  return string.gsub(sysconfig.primary_mac, ':', '')
+end