diff --git a/dot_bin/executable_zoxide b/dot_bin/executable_zoxide
new file mode 100755
index 0000000..b226d79
Binary files /dev/null and b/dot_bin/executable_zoxide differ
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 17fbabb..326e928 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -39,9 +39,7 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'   # ignore case
 source ~/.zsh/aliases
 source ~/.zsh/functions
 source ~/.zsh/exports
-source ~/.zsh/dstask-completion.zsh
 source ~/.zsh/fzf-completion.zsh
-source ~/.zsh/scw-completion.zsh
 
 {{- if eq .chezmoi.hostname "taupo" }}
 source ~/.zsh/aliases_taupo
@@ -49,8 +47,10 @@ source ~/.zsh/functions_taupo
 source ~/.config/broot/launcher/bash/br
 source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
 #source /usr/share/doc/fzf/examples/key-bindings.zsh
-eval "$(zoxide init zsh)"
+source ~/.zsh/scw-completion.zsh
+source ~/.zsh/dstask-completion.zsh
 {{- end }}
+eval "$(zoxide init zsh)"
 eval "$(starship init zsh)"
 source <(antibody init)
 antibody bundle < ~/.zsh_plugins