diff --git a/ci/install-ci-libraries.sh b/ci/install-ci-libraries.sh
index 6ac397c10d..ae7e92be0f 100755
--- a/ci/install-ci-libraries.sh
+++ b/ci/install-ci-libraries.sh
@@ -65,6 +65,3 @@ apt-get install -y clang-$LLVM_VERSION lldb-$LLVM_VERSION lld-$LLVM_VERSION clan
 wget -c https://ziglang.org/builds/zig-linux-x86_64-0.6.0+0088efc4b.tar.xz --no-check-certificate
 tar -xf zig-linux-x86_64-0.6.0+0088efc4b.tar.xz
 ln -s "$PWD/zig-linux-x86_64-0.6.0+0088efc4b/zig" /usr/local/bin/zig
-
-# symlink llvm tools
-ln -s /usr/bin/llvm-as-10 /usr/local/bin/llvm-as
diff --git a/compiler/builtins/build.rs b/compiler/builtins/build.rs
index 19291ae333..711b7e4252 100644
--- a/compiler/builtins/build.rs
+++ b/compiler/builtins/build.rs
@@ -62,7 +62,7 @@ fn main() {
     let dest_bc = dest_bc_path.to_str().expect("Invalid dest bc path");
     println!("Compiling bitcode to: {}", dest_bc);
 
-    run_command("llvm-as", &[dest_ll, "-o", dest_bc]);
+    run_command("llvm-as-10", &[dest_ll, "-o", dest_bc]);
 
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-changed={}", src_path_str);
diff --git a/nix/bin/llvm-as-10 b/nix/bin/llvm-as-10
new file mode 100755
index 0000000000..65839a9b5a
--- /dev/null
+++ b/nix/bin/llvm-as-10
@@ -0,0 +1,2 @@
+#!/bin/sh
+llvm-as "$@"
diff --git a/shell.nix b/shell.nix
index ffcdeb2d37..94386b1d82 100644
--- a/shell.nix
+++ b/shell.nix
@@ -52,5 +52,10 @@ let
 in pkgs.mkShell {
   buildInputs = inputs ++ darwin-frameworks;
   LLVM_SYS_100_PREFIX = "${llvm}";
+
+  # Aliases don't work cross shell, so we do this
+  shellHook = ''
+    export PATH="$PATH:$PWD/nix/bin"
+  '';
 }