diff --git a/configuration.nix b/configuration.nix
index 4a36bfb..4e428c5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -7,6 +7,8 @@
    imports =
        [
            ./hardware-configuration.nix
+           "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+           ./disko-config.nix
 #           ./programs.nix
        ];
 
@@ -18,13 +20,6 @@
       systemd-boot.consoleMode = "0";
    };
 
-      boot.initrd.luks.devices = {
-      root = { 
-      device = "/dev/sda";
-      preLVM = true;
-      };
-   };
-
    #nix.settings.auto-optimise-store = true;
    nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
diff --git a/partitions/luks-btrfs-subvolumes.nix b/partitions/luks-btrfs-subvolumes.nix
index dc8b6fe..6fa5122 100644
--- a/partitions/luks-btrfs-subvolumes.nix
+++ b/partitions/luks-btrfs-subvolumes.nix
@@ -3,7 +3,7 @@
     disk = {
       vdb = {
         type = "disk";
-        device = "/dev/vdb";
+        device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {
diff --git a/partitions/simple-efi.nix b/partitions/simple-efi.nix
index 2c0dd87..3332773 100644
--- a/partitions/simple-efi.nix
+++ b/partitions/simple-efi.nix
@@ -2,7 +2,7 @@
   disko.devices = {
     disk = {
       vda = {
-        device = "/dev/vda";
+        device = "/dev/sda";
         type = "disk";
         content = {
           type = "gpt";
diff --git a/systems/vm.nix b/systems/vm.nix
index 9057e1c..b63b265 100644
--- a/systems/vm.nix
+++ b/systems/vm.nix
@@ -7,6 +7,8 @@
    imports =
        [
            ./hardware-configuration.nix
+           "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+           ./disko-config.nix
 #           ./programs.nix
        ];
 
@@ -19,13 +21,6 @@
       systemd-boot.consoleMode = "0";
    };
 
-      boot.initrd.luks.devices = {
-      root = { 
-      device = "/dev/sda";
-      preLVM = true;
-      };
-   };
-
    #nix.settings.auto-optimise-store = true;
    nix.settings.experimental-features = [ "nix-command" "flakes" ];