diff --git a/configuration.nix b/configuration.nix
index b7a40d6..9d30cc9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,9 +12,16 @@
   
   boot.plymouth.enable = true;
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.systemd-boot.configurationLimit = 2;
+  #boot.loader.systemd-boot.enable = true;
+  #boot.loader.systemd-boot.configurationLimit = 2;
+
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.loader.grub = {
+    configurationLimit = 2;
+    efiSupport = true;
+    device = "nodev";
+  };
 
   # Use xanmod kernel
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
diff --git a/global/stateless-configuration.nix b/global/stateless-configuration.nix
index cc820fc..8c4bb4e 100644
--- a/global/stateless-configuration.nix
+++ b/global/stateless-configuration.nix
@@ -9,6 +9,11 @@
             "/etc/NetworkManager/system-connections"
             "/root"
             "/var"
+            "/boot"
+        ];
+
+        files = [
+            "/etc/machine-id"
         ];
     };
 
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 12f1c68..467e769 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -19,7 +19,7 @@
         options = [ "relatime" "mode=755" ];
     };
 
-    fileSystems."/boot" = { 
+    fileSystems."/boot/efi" = { 
         device = "/dev/disk/by-uuid/8095-BE1B";
         fsType = "vfat";
     };