diff --git a/nixos/boot.nix b/nixos/boot.nix
index 3156bf32..815b4135 100644
--- a/nixos/boot.nix
+++ b/nixos/boot.nix
@@ -6,9 +6,6 @@
     loader.grub = {
       enable = true;
       version = 2;
-      device = "nodev";
-      efiSupport = true;
     };
-    loader.efi.canTouchEfiVariables = true;
   };
 }
\ No newline at end of file
diff --git a/nixos/boxes/skinnyv.nix b/nixos/boxes/skinnyv.nix
index 06a6baad..630a330b 100644
--- a/nixos/boxes/skinnyv.nix
+++ b/nixos/boxes/skinnyv.nix
@@ -12,6 +12,11 @@
         preLVM = true;
         allowDiscards = true;
       }];
+    loader.grub = {
+      device = "nodev";
+      efiSupport = true;
+    };
+    loader.efi.canTouchEfiVariables = true;
   };
   time.timeZone = "Europe/London";
   imports = [ ../common.nix ];
diff --git a/nixos/boxes/thinky.nix b/nixos/boxes/thinky.nix
index b69b26c0..38465f04 100644
--- a/nixos/boxes/thinky.nix
+++ b/nixos/boxes/thinky.nix
@@ -10,6 +10,9 @@
         preLVM = true;
         allowDiscards = true;
       }];
+    loader.grub = {
+      device = "nodev";
+    };
   };
   time.timeZone = "Europe/Warsaw";
   imports = [ ../common.nix ];
diff --git a/nixos/common.nix b/nixos/common.nix
index cc0af0d9..d6988a86 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -2,7 +2,7 @@
 
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
-  etesync-dav = import "/home/cyryl/dev/dotfiles/nixos/packages/etesync-dav/default.nix";
+  etesync-dav = import ./packages/etesync-dav/default.nix;
 in
 {
   imports =
@@ -103,7 +103,6 @@ in
 
   security.pam.services.gdm.enableGnomeKeyring = true;
 
-
   sound.enable = true;
   hardware.pulseaudio.enable = true;
   hardware.u2f.enable = true;