diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index ec944a0..b5118a1 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -1,9 +1,14 @@
+{ den, ... }:
 let
   completions = builtins.readFile ./completions.zsh;
   keybindings = builtins.readFile ./keybindings.zsh;
 in
 {
-  den.aspects.zsh = {
+  den.aspects.shell.zsh = {
+    includes = [
+      (den.batteries.user-shell "zsh")
+    ];
+
     homeManager =
       { lib, pkgs, ... }:
       {
diff --git a/modules/users/igneous.nix b/modules/users/igneous.nix
index d90be3b..579b6d8 100644
--- a/modules/users/igneous.nix
+++ b/modules/users/igneous.nix
@@ -5,10 +5,9 @@
     includes = [
       den.batteries.define-user
       den.batteries.primary-user
-      (den.batteries.user-shell "zsh")
 
       den.aspects.shell
-      den.aspects.zsh
+      den.aspects.shell.zsh
     ];
 
     homeManager =