diff --git a/flake.nix b/flake.nix
index 0c33b1c..500d77e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,19 +31,25 @@
                   };
                   shell =
                     let
-                      #riscv64-linux = prev.pkgsCross.riscv64-embedded.__splicedPackages;
-                      riscv64-linux = (import prev.pkgs.path {
-                        localSystem = system;
-                        crossSystem = {
+                      riscv64-linux = prev.pkgsCross.riscv64-embedded.__splicedPackages;
+                      # Everything here builds and runs without needing the below crossSystem
+                      #riscv64-linux = (import prev.pkgs.path {
+                      #  localSystem = system;
+                      #  crossSystem = {
 
-                          config = "riscv64-none-elf";
-                          libc = "newlib";
-                          gcc = {
-                            arch = "rv64g";
-                            abi = "lp64d";
-                          };
-                        };
-                      }).__splicedPackages;
+                      #    config = "riscv64-none-elf";
+                      #    libc = "newlib";
+                      #    gcc = {
+                      #      # Both sets work to build and run hello_world
+                      #      # This matches what is in the makefile
+                      #      #arch = "rv64ima";
+                      #      #abi = "lp64";
+                      #      # This matches what you asked for on matrix
+                      #      #arch = "rv64g";
+                      #      #abi = "lp64d";
+                      #    };
+                      #  };
+                      #}).__splicedPackages;
                     in
                     {
                       tools = {