diff --git a/zsh/custom/plugins/zsh-autosuggestions b/zsh/custom/plugins/zsh-autosuggestions
index 0e810e5..85919cd 160000
--- a/zsh/custom/plugins/zsh-autosuggestions
+++ b/zsh/custom/plugins/zsh-autosuggestions
@@ -1 +1 @@
-Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15
+Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5
diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc
index e58ba2b..f0ceeb4 100644
--- a/zsh/dot-zshrc
+++ b/zsh/dot-zshrc
@@ -15,6 +15,7 @@ zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 # ENABLE_CORRECTION="true"
 COMPLETION_WAITING_DOTS="true"
 ZSH_DISABLE_COMPFIX="true"
+ZOXIDE_CMD_OVERRIDE="cd"
 
 plugins=(
 	git
@@ -26,6 +27,7 @@ plugins=(
 	command-not-found
 	zsh-autopair
 	fast-syntax-highlighting
+	zoxide
 )
 
 bindkey -M vicmd "k" up-line-or-beginning-search
@@ -124,8 +126,9 @@ if (( $+commands[fd] )); then
 	export FZF_DEFAULT_COMMAND="fd --type f --strip-cwd-prefix"
 	export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 fi
+
 if (( $+commands[fzf] )); then
-	source <(fzf --zsh)
+	# Fix fzf keybind after zsh-vi-mode has loaded
 	zvm_after_init_commands+=('source <(fzf --zsh)')
 
 	if (( $+commands[paru] )); then
diff --git a/zsh/ohmyzsh b/zsh/ohmyzsh
index 8c168e2..8df5c1b 160000
--- a/zsh/ohmyzsh
+++ b/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 8c168e26625ac8376d9156b1b189cd2ae8c16dc7
+Subproject commit 8df5c1b18b1393dc5046c729094f897bd3636a9b