diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1753bdc84186..1364b28182d1 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -146,7 +146,7 @@
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
   ./system/boot/kernel.nix
-  #./system/boot/luksroot.nix
+  ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix
index f345db459f0f..a01395647a37 100644
--- a/modules/system/boot/luksroot.nix
+++ b/modules/system/boot/luksroot.nix
@@ -10,7 +10,7 @@ in
   options = {
 
     boot.initrd.luksRoot = mkOption {
-      default = null;
+      default = "";
       example = "/dev/sda3";
       description = '';
         The device that should be decrypted using LUKS before trying to mount the
@@ -26,7 +26,7 @@ in
 
 
 
-  config = mkIf (luksRoot != null) {
+  config = mkIf (luksRoot != "") {
 
     boot.initrd.extraUtilsCommands = ''
       cp -r ${pkgs.cryptsetup}/lib/* $out/lib/