diff --git a/src/main/python/keyboard_comm.py b/src/main/python/keyboard_comm.py
index f1b1b06..e04e188 100644
--- a/src/main/python/keyboard_comm.py
+++ b/src/main/python/keyboard_comm.py
@@ -58,7 +58,6 @@ class Keyboard:
         self.encoders = []
         self.macro_count = 0
         self.macro_memory = 0
-        self.uid = 0
         self.macro = b""
         self.vibl = False
 
@@ -72,7 +71,6 @@ class Keyboard:
         self.layout = dict()
         self.encoder_layout = dict()
 
-        self.uid = struct.unpack(">Q", self.get_uid())[0]
         self.reload_layout(sideload_json)
         self.reload_layers()
         self.reload_keymap()
@@ -249,7 +247,7 @@ class Keyboard:
     def save_layout(self):
         """ Serializes current layout to a binary """
 
-        data = {"version": 1, "uid": self.uid}
+        data = {"version": 1, "uid": self.keyboard_id}
 
         layout = []
         for l in range(self.layers):
diff --git a/src/main/python/keyboard_container.py b/src/main/python/keyboard_container.py
index e8d7b3f..fcfde56 100644
--- a/src/main/python/keyboard_container.py
+++ b/src/main/python/keyboard_container.py
@@ -168,7 +168,7 @@ class KeyboardContainer(QWidget):
         return self.keyboard.save_layout()
 
     def restore_layout(self, data):
-        if json.loads(data.decode("utf-8")).get("uid") != self.keyboard.uid:
+        if json.loads(data.decode("utf-8")).get("uid") != self.keyboard.keyboard_id:
             ret = QMessageBox.question(self, "", tr("KeyboardContainer", "Saved keymap belongs to a different keyboard,"
                                                                          " are you sure you want to continue?"),
                                        QMessageBox.Yes | QMessageBox.No)