diff --git a/defaults/default.nix b/defaults/default.nix
index cf1bee4..49cb7f5 100644
--- a/defaults/default.nix
+++ b/defaults/default.nix
@@ -12,10 +12,15 @@ in
   imports = [
     ./jp.nix
     ./plasma.nix
+    ./browsers.nix
+
     ./tmux.nix
     ./git.nix
     ./shell.nix
-    ./browsers.nix
+
+    ./nix.nix
+    ./lix.nix
+    ./system.nix
   ];
 
   options.nixowos.${name} = {
@@ -26,10 +31,15 @@ in
     nixowos.${name} = lib.mkDefault {
       jp.enable = true;
       plasma.enable = config.services.desktopManager.plasma6.enable;
+      browers.enable = true;
+
       tmux.enable = true;
       git.enable = true;
       shell.enable = true;
-      browers.enable = true;
+
+      nix.enable = true;
+      lix.enable = true;
+      system.enable = true;
     };
   };
 }
diff --git a/defaults/lix.nix b/defaults/lix.nix
index 500c011..55386dd 100644
--- a/defaults/lix.nix
+++ b/defaults/lix.nix
@@ -7,10 +7,10 @@
 
 let
   name = "lix";
-  cfg = config.nixowos.system.${name};
+  cfg = config.nixowos.defaults.${name};
 in
 {
-  options.nixowos.system.${name} = {
+  options.nixowos.defaults.${name} = {
     enable = lib.mkEnableOption name;
   };
 
diff --git a/defaults/nix.nix b/defaults/nix.nix
index f557d2b..d27f4e5 100644
--- a/defaults/nix.nix
+++ b/defaults/nix.nix
@@ -7,10 +7,10 @@
 
 let
   name = "nix";
-  cfg = config.nixowos.system.${name};
+  cfg = config.nixowos.defaults.${name};
 in
 {
-  options.nixowos.system.${name} = {
+  options.nixowos.defaults.${name} = {
     enable = lib.mkEnableOption name;
   };
 
diff --git a/defaults/system.nix b/defaults/system.nix
index a094fd8..00f0f66 100644
--- a/defaults/system.nix
+++ b/defaults/system.nix
@@ -7,16 +7,10 @@
 
 let
   name = "system";
-  cfg = config.nixowos.${name};
+  cfg = config.nixowos.defaults.${name};
 in
 {
-  imports = [
-    ./lix.nix
-    ./nix.nix
-    ./luks.nix
-  ];
-
-  options.nixowos.${name} = {
+  options.nixowos.defaults.${name} = {
     enable = lib.mkEnableOption name;
 
     extraPackages = lib.mkOption {
@@ -28,11 +22,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    nixowos.${name} = lib.mkDefault {
-      lix.enable = true;
-      nix.enable = true;
-      luks.enable = true;
-    };
 
     environment.systemPackages = cfg.extraPackages;