diff --git a/dotfiles/commonfunc b/dotfiles/commonfunc
index 3376bf9..822e760 100644
--- a/dotfiles/commonfunc
+++ b/dotfiles/commonfunc
@@ -139,6 +139,15 @@ EOF
     fi
 }
 
+# zoxide z functions, since my default zoxide init will overwrite the cd command
+z () {
+	__zoxide_z "$@"
+}
+
+zi () {
+	__zoxide_zi "$@"
+}
+
 {%@@ if distro == 'macos' @@%}
 #######################################
 # Shows a netstat -tulpn styled output on mac.
@@ -432,4 +441,4 @@ setVpnGitRemote() {
 
   echo -e "🔗 git remote (${HIGHLIGHT}${ORIGIN}${RESET}): ${HIGHLIGHT}${repo}${RESET}\n"
 }
-{%@@ endif @@%}
\ No newline at end of file
+{%@@ endif @@%}
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index dd8ab31..facef7c 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -72,6 +72,9 @@ COMPLETION_WAITING_DOTS="true"
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
+# set zoxide command to cd
+ZOXIDE_CMD_OVERRIDE="cd"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
@@ -103,6 +106,7 @@ plugins=(
   themes
   uv
   vscode
+  zoxide
   zsh-navigation-tools
   zsh-ssh
 {%@@ if distro == 'macos' @@%}  # Mac specifics
@@ -210,5 +214,3 @@ autoload -Uz compinit
 zstyle ':completion:*' menu select
 fpath+=~/.zfunc
 {%@@ endif @@%}
-
-[[ $(command -v zoxide) ]] && eval "$(zoxide init zsh)"