diff --git a/machines/SurfaceGo/configuration.nix b/machines/SurfaceGo/configuration.nix
index 1fd9518..1dd588b 100644
--- a/machines/SurfaceGo/configuration.nix
+++ b/machines/SurfaceGo/configuration.nix
@@ -5,21 +5,27 @@
 { config, pkgs, lib, ... }:
 
 {
-	# Use grub boot loader
-	boot.loader = {
-		systemd-boot.enable = false;
-		grub = {
-			enable = true;
-			device = "nodev";
-			efiSupport = true;
-			enableCryptodisk = true;
-		};
-		efi = {
-			efiSysMountPoint = "/boot/efi";
-			canTouchEfiVariables = true;
+	boot = {
+		loader = {
+			# Use grub boot loader
+			systemd-boot.enable = false;
+			grub = {
+				enable = true;
+				device = "nodev";
+				efiSupport = true;
+				enableCryptodisk = true;
+			};
+			efi = {
+				efiSysMountPoint = "/boot/efi";
+				canTouchEfiVariables = true;
+			};
 		};
+		# I need systemd for tpm luks unlocking
+		initrd.systemd.enable = true;
 	};
 
+	security.tpm2.enable = true;
+
 	networking.hostName = "SurfaceGo"; # Define your hostname.
 	networking.networkmanager.enable = true; # Enable networking
 
diff --git a/machines/SurfaceGo/hardware-configuration.nix b/machines/SurfaceGo/hardware-configuration.nix
index e8f4999..75c5c1a 100644
--- a/machines/SurfaceGo/hardware-configuration.nix
+++ b/machines/SurfaceGo/hardware-configuration.nix
@@ -1,12 +1,9 @@
 	# Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, /*modulesPath,*/ ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  /*imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];*/
 
 	boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc" ];
 	boot.initrd.kernelModules = [ ];
@@ -39,12 +36,6 @@
 		options = [ "subvol=@home" "compress=zstd" ];
 	};
 
-	/*fileSystems."/swap" = {
-		device = "/dev/disk/by-uuid/19a52b40-3ff6-47ff-9402-18d8b289643e";
-		fsType = "btrfs";
-		options = [ "subvol=@swapfile" ];
-	};*/
-
 	fileSystems."/boot/efi" = {
 		device = "/dev/disk/by-uuid/EC76-201F";
 		fsType = "vfat";