diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/modules/users/tdpeuter/default.nix
index 0d877be..0de33d2 100644
--- a/nixos/modules/users/tdpeuter/default.nix
+++ b/nixos/modules/users/tdpeuter/default.nix
@@ -50,6 +50,7 @@ in {
           nextcloud-client
           nsxiv                 # Lightweight image viewer
           obsidian
+          oh-my-zsh
           qalculate-gtk         # Calculator
           spotify
           tea                   # Gitea CLI
@@ -100,7 +101,12 @@ in {
           };
           ".oh-my-zsh" = {
             enable = (builtins.elem pkgs.zsh installedPkgs);
-            source = ../../../../stow/zsh/.oh-my-zsh;
+            source = "${pkgs.oh-my-zsh}/share/oh-my-zsh";
+            recursive = true;
+          };
+          ".oh-my-zsh/themes/tdpeuter.zsh-theme" = {
+            enable = (builtins.elem pkgs.zsh installedPkgs);
+            source = ../../../../stow/zsh/.oh-my-zsh/themes/tdpeuter.zsh-theme;
           };
           ".vim" = {
             enable = (builtins.elem pkgs.vim installedPkgs);
diff --git a/nixos/overlays/cmdtime/default.nix b/nixos/overlays/cmdtime/default.nix
index afc864f..6ff497f 100644
--- a/nixos/overlays/cmdtime/default.nix
+++ b/nixos/overlays/cmdtime/default.nix
@@ -11,7 +11,7 @@ final: prev: {
 
     installPhase = ''
       mkdir -p $out/share/cmdtime
-      cp $src/cmdtime.plugin.zsh $out/share/cmdtime.plugin.zsh
+      cp $src/cmdtime.plugin.zsh $out/share/cmdtime/cmdtime.plugin.zsh
     '';
   };
 }
diff --git a/stow/zsh/.zshrc b/stow/zsh/.zshrc
index 5209f6b..d6e4b06 100644
--- a/stow/zsh/.zshrc
+++ b/stow/zsh/.zshrc
@@ -6,7 +6,7 @@ fpath+="$HOME/.zsh/plugins/cmdtime"
 plugins=(dirhistory git screen)
 ZSH_CUSTOM="$HOME/.oh-my-zsh"
 ZSH_THEME="tdpeuter"
-# source $ZSH/oh-my-zsh.sh
+source $ZSH_CUSTOM/oh-my-zsh.sh
 
 if [[ -f "$HOME/.zsh/plugins/cmdtime/cmdtime.plugin.zsh" ]]; then
     source "$HOME/.zsh/plugins/cmdtime/cmdtime.plugin.zsh"