diff --git a/install.sh b/install.sh
index eabdcbb..7e81f18 100644
--- a/install.sh
+++ b/install.sh
@@ -20,6 +20,11 @@ mount ${DISK}2 /mnt
 mkdir -p /mnt/boot
 mount ${DISK}1 /mnt/boot
 
+cryptsetup luksFormat /dev/sda2
+cryptsetup open /dev/sda2 root
+mkfs.ext4 /dev/mapper/root
+mount /dev/mapper/root /mnt
+
 mkdir -p /mnt/etc/nixos
 # Clone the configuration repository
 git clone https://git.luke-else.co.uk/luke-else/nixos-config.git /mnt/etc/nixos
@@ -28,11 +33,7 @@ git clone https://git.luke-else.co.uk/luke-else/nixos-config.git /mnt/etc/nixos
 nixos-generate-config --root /mnt
 
 # Install NixOS using the cloned configuration
-nixos-install --root /mnt --flake /mnt/etc/nixos#vm
-
-# Set the root password
-echo "Please set the root password:"
-passwd
+nixos-install --flake /mnt/etc/nixos#vm
 
 # Reboot the system
 echo "Installation complete. Rebooting..."
diff --git a/modules/common.nix b/modules/common.nix
index 6dce439..6788015 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -8,6 +8,11 @@
     efiSupport = true;
   };
 
+  boot.loader.efi = {
+    efiSysMountPoint = "/boot/efi";
+    canTouchEfiVariables = true;
+  };
+
   fileSystems."/" = {
     device = "/dev/mapper/root";
     fsType = "ext4";