diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6bbd6fa..bd7e717 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -71,10 +71,6 @@ export VISUAL='nvim'
 alias ls="ls --color=always"
 alias cgrep="grep --color=always"
 
-# Use safecp/safemv from the tools-repo when available
-(( $+commands[safecp] )) && alias cp=safecp
-(( $+commands[safemv] )) && alias mv=safemv
-
 delzip() {
    unzip -Z -1 "$@" |  xargs -I{} rm -rf {}
 }
@@ -87,6 +83,10 @@ if `which go &>/dev/null`; then
     export GOPATH=$(go env GOPATH)
 fi
 
+# Use safecp/safemv from the tools-repo when available (after ~/.local/bin is on PATH)
+(( $+commands[safecp] )) && alias cp=safecp
+(( $+commands[safemv] )) && alias mv=safemv
+
 if [[ -f ~/.ssh/sudo_key ]]; then 
     [[ -e /tmp/sudo-agent.sock ]] || ssh-agent -a /tmp/sudo-agent.sock &> /dev/null
     SSH_AUTH_SOCK=/tmp/sudo-agent.sock ssh-add -l | grep -q `ssh-keygen -lf ~/.ssh/sudo_key | awk '{print $2}'` || SSH_AUTH_SOCK=/tmp/sudo-agent.sock ssh-add ~/.ssh/sudo_key