diff --git a/modules/common.nix b/modules/common.nix
index 4509915..bff7df8 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -1,27 +1,39 @@
 { config, pkgs, ... }:
 
 {
-  # Bootloader
+  # Bootloader: systemd-boot with EFI support
   boot = {
     loader = {
-      systemd-boot = {
-        enable = true;
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    # Enable support for LUKS
+    initrd = {
+      luks.devices = {
+        "root" = {
+          device = "/dev/sda1"; # Change to your actual encrypted partition
+          preLVM = true;
+          allowDiscards = true; # Enable if using an SSD with TRIM support
+        };
       };
     };
-    efi = {
-      enable = true;
-      canTouchEfiVariables = true;
-      espDevice = "/dev/sda2";
-    };
-    initrd.luks.devices.cryptroot.device = "/dev/sda1";
-  }
+  };
 
+  # File systems
   fileSystems."/" = {
-    device = "/dev/mapper/root";
+    device = "/dev/mapper/root"; # LUKS unlocked device
     fsType = "ext4";
   };
 
-  swapDevices = [{ device = "/swapfile"; size = 8192; }];
+  # EFI partition mount (usually /boot or /boot/efi)
+  fileSystems."/boot" = {
+    device = "/dev/sda2"; # Change to your actual EFI partition
+    fsType = "vfat";
+    options = [ "nofail" "defaults" ];
+  };
+
+  swapDevices = [{ device = "/swapfile"; size = 4096; }];
 
   # Locales and timezone
   time.timeZone = "Europe/London";