diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5c940ea5..295ee650 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,6 +60,8 @@ jobs:
       # setup
       - uses: actions/checkout@v2
       - uses: cedx/setup-dart@v2
+        with:
+          release-channel: beta
       - run: sudo apt-get install -y libsqlite3-dev
         name: Install sqlite3 for tests
       - run: dart pub upgrade
diff --git a/moor/pubspec.yaml b/moor/pubspec.yaml
index 7ef0bcb9..39968c18 100644
--- a/moor/pubspec.yaml
+++ b/moor/pubspec.yaml
@@ -44,12 +44,12 @@ dependency_overrides:
 
   uuid:
     git:
-      url: https://github.com/simolus3/dart-uuid.git
-      ref: null-safety
+      url: https://github.com/Daegalus/dart-uuid.git
+      ref: nullsafety
 
   crypto:
     git:
       url: https://github.com/dart-lang/crypto.git
-      ref: "3.0"
+      ref: master
 
   convert: ^3.0.0-nullsafety
\ No newline at end of file