diff --git a/lib/ash/engine/request.ex b/lib/ash/engine/request.ex
index 49c6ed67..9836f772 100644
--- a/lib/ash/engine/request.ex
+++ b/lib/ash/engine/request.ex
@@ -159,7 +159,7 @@ defmodule Ash.Engine.Request do
           raise "Got a weird thing #{inspect(other)}"
       end
 
-    id = Ecto.UUID.generate()
+    id = Ash.UUID.generate()
 
     data =
       case opts[:data] do
diff --git a/lib/ash/error/changes/invalid_argument.ex b/lib/ash/error/changes/invalid_argument.ex
index ce262920..4eb4a997 100644
--- a/lib/ash/error/changes/invalid_argument.ex
+++ b/lib/ash/error/changes/invalid_argument.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.InvalidArgument do
   def_ash_error([:field, :message], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_argument"
 
diff --git a/lib/ash/error/changes/invalid_attribute.ex b/lib/ash/error/changes/invalid_attribute.ex
index a9092912..cccd398a 100644
--- a/lib/ash/error/changes/invalid_attribute.ex
+++ b/lib/ash/error/changes/invalid_attribute.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.InvalidAttribute do
   def_ash_error([:field, :message], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_attribute"
 
diff --git a/lib/ash/error/changes/invalid_changes.ex b/lib/ash/error/changes/invalid_changes.ex
index 9800b4fa..46c876a7 100644
--- a/lib/ash/error/changes/invalid_changes.ex
+++ b/lib/ash/error/changes/invalid_changes.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.InvalidChanges do
   def_ash_error([:fields, :message, :validation], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_attribute"
 
diff --git a/lib/ash/error/changes/invalid_relationship.ex b/lib/ash/error/changes/invalid_relationship.ex
index a8e1ef54..efb464a0 100644
--- a/lib/ash/error/changes/invalid_relationship.ex
+++ b/lib/ash/error/changes/invalid_relationship.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.InvalidRelationship do
   def_ash_error([:relationship, :message], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_relationship"
 
diff --git a/lib/ash/error/changes/no_such_attribute.ex b/lib/ash/error/changes/no_such_attribute.ex
index b7f07877..40697dd0 100644
--- a/lib/ash/error/changes/no_such_attribute.ex
+++ b/lib/ash/error/changes/no_such_attribute.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.NoSuchAttribute do
   def_ash_error([:resource, :name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_attribute"
 
diff --git a/lib/ash/error/changes/no_such_relationship.ex b/lib/ash/error/changes/no_such_relationship.ex
index 356f636a..f34ece85 100644
--- a/lib/ash/error/changes/no_such_relationship.ex
+++ b/lib/ash/error/changes/no_such_relationship.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.NoSuchRelationship do
   def_ash_error([:resource, :name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_relationship"
 
diff --git a/lib/ash/error/changes/required.ex b/lib/ash/error/changes/required.ex
index 615d04b5..3c05718f 100644
--- a/lib/ash/error/changes/required.ex
+++ b/lib/ash/error/changes/required.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.Required do
   def_ash_error([:field, :type], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "required"
 
diff --git a/lib/ash/error/changes/unknown_error.ex b/lib/ash/error/changes/unknown_error.ex
index 31d3e6e3..340eb5be 100644
--- a/lib/ash/error/changes/unknown_error.ex
+++ b/lib/ash/error/changes/unknown_error.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Changes.UnknownError do
   def_ash_error([:field, :error], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "unknown_change_error"
 
diff --git a/lib/ash/error/forbidden/must_pass_strict_check.ex b/lib/ash/error/forbidden/must_pass_strict_check.ex
index bb22ee27..d7e1dcf0 100644
--- a/lib/ash/error/forbidden/must_pass_strict_check.ex
+++ b/lib/ash/error/forbidden/must_pass_strict_check.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Forbidden.MustPassStrictCheck do
   def_ash_error([:resource], class: :forbidden)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "must_pass_strict_check"
 
diff --git a/lib/ash/error/framework.ex b/lib/ash/error/framework.ex
index 533b94df..92d8c903 100644
--- a/lib/ash/error/framework.ex
+++ b/lib/ash/error/framework.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Framework do
   def_ash_error([:errors, :stacktraces?], class: :framework)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "framework"
 
diff --git a/lib/ash/error/framework/assumption_failed.ex b/lib/ash/error/framework/assumption_failed.ex
index aa95e32d..17e6f948 100644
--- a/lib/ash/error/framework/assumption_failed.ex
+++ b/lib/ash/error/framework/assumption_failed.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Framework.AssumptionFailed do
   def_ash_error([:message], class: :framework)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "assumption_failed"
 
diff --git a/lib/ash/error/framework/synchronous_engine_stuck.ex b/lib/ash/error/framework/synchronous_engine_stuck.ex
index 202c3b30..a76f1de4 100644
--- a/lib/ash/error/framework/synchronous_engine_stuck.ex
+++ b/lib/ash/error/framework/synchronous_engine_stuck.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Framework.SynchronousEngineStuck do
   def_ash_error([], class: :framework)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "synchronous_engine_stuck"
 
diff --git a/lib/ash/error/invalid.ex b/lib/ash/error/invalid.ex
index 107a9a64..e9682d43 100644
--- a/lib/ash/error/invalid.ex
+++ b/lib/ash/error/invalid.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid do
   def_ash_error([:errors, :stacktraces?], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid"
 
diff --git a/lib/ash/error/invalid/duplicated_path.ex b/lib/ash/error/invalid/duplicated_path.ex
index 3102480c..d8725222 100644
--- a/lib/ash/error/invalid/duplicated_path.ex
+++ b/lib/ash/error/invalid/duplicated_path.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.DuplicatedPath do
   def_ash_error([:paths], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "duplicated_path"
 
diff --git a/lib/ash/error/invalid/impossible_path.ex b/lib/ash/error/invalid/impossible_path.ex
index 17003649..2ff02ec7 100644
--- a/lib/ash/error/invalid/impossible_path.ex
+++ b/lib/ash/error/invalid/impossible_path.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.ImpossiblePath do
   def_ash_error([:impossible_path], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "impossible_path"
 
diff --git a/lib/ash/error/invalid/invalid_primary_key.ex b/lib/ash/error/invalid/invalid_primary_key.ex
index a035da61..971947a0 100644
--- a/lib/ash/error/invalid/invalid_primary_key.ex
+++ b/lib/ash/error/invalid/invalid_primary_key.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.InvalidPrimaryKey do
   def_ash_error([:resource, :value], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_primary_key"
 
diff --git a/lib/ash/error/invalid/limit_required.ex b/lib/ash/error/invalid/limit_required.ex
index 40a64ca7..42d52491 100644
--- a/lib/ash/error/invalid/limit_required.ex
+++ b/lib/ash/error/invalid/limit_required.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.LimitRequired do
   def_ash_error([], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "limit_is_required"
 
diff --git a/lib/ash/error/invalid/multiple_results.ex b/lib/ash/error/invalid/multiple_results.ex
index 6639cb7b..0b35757c 100644
--- a/lib/ash/error/invalid/multiple_results.ex
+++ b/lib/ash/error/invalid/multiple_results.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.MultipleResults do
   def_ash_error([:count, :query, :at_least?], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "multiple_results"
 
diff --git a/lib/ash/error/invalid/no_primary_action.ex b/lib/ash/error/invalid/no_primary_action.ex
index 4bc38651..a12d1aaf 100644
--- a/lib/ash/error/invalid/no_primary_action.ex
+++ b/lib/ash/error/invalid/no_primary_action.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.NoPrimaryAction do
   def_ash_error([:resource, :type], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_primary_action"
 
diff --git a/lib/ash/error/invalid/no_such_action.ex b/lib/ash/error/invalid/no_such_action.ex
index 9aa07de0..717fce9f 100644
--- a/lib/ash/error/invalid/no_such_action.ex
+++ b/lib/ash/error/invalid/no_such_action.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.NoSuchAction do
   def_ash_error([:resource, :action, :type], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_action"
 
diff --git a/lib/ash/error/invalid/no_such_resource.ex b/lib/ash/error/invalid/no_such_resource.ex
index 4b6e261a..bb84d256 100644
--- a/lib/ash/error/invalid/no_such_resource.ex
+++ b/lib/ash/error/invalid/no_such_resource.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.NoSuchResource do
   def_ash_error([:resource], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_resource"
 
diff --git a/lib/ash/error/invalid/pagination_required.ex b/lib/ash/error/invalid/pagination_required.ex
index f38dfd9f..b9204b41 100644
--- a/lib/ash/error/invalid/pagination_required.ex
+++ b/lib/ash/error/invalid/pagination_required.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Invalid.PaginationRequired do
   def_ash_error([], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "pagination_required"
 
diff --git a/lib/ash/error/query/aggregates_not_supported.ex b/lib/ash/error/query/aggregates_not_supported.ex
index 96ef44e4..ac1b660c 100644
--- a/lib/ash/error/query/aggregates_not_supported.ex
+++ b/lib/ash/error/query/aggregates_not_supported.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.AggregatesNotSupported do
   def_ash_error([:resource, :feature], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "aggregates_not_supported"
 
diff --git a/lib/ash/error/query/invalid_argument.ex b/lib/ash/error/query/invalid_argument.ex
index 53794359..dc1410b9 100644
--- a/lib/ash/error/query/invalid_argument.ex
+++ b/lib/ash/error/query/invalid_argument.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidArgument do
   def_ash_error([:field, :message], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_argument"
 
diff --git a/lib/ash/error/query/invalid_expression.ex b/lib/ash/error/query/invalid_expression.ex
index fdd95166..e16fa6d2 100644
--- a/lib/ash/error/query/invalid_expression.ex
+++ b/lib/ash/error/query/invalid_expression.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidExpression do
   def_ash_error([:expression, :message], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_expression"
 
diff --git a/lib/ash/error/query/invalid_filter_value.ex b/lib/ash/error/query/invalid_filter_value.ex
index 9fdaad87..21813017 100644
--- a/lib/ash/error/query/invalid_filter_value.ex
+++ b/lib/ash/error/query/invalid_filter_value.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidFilterValue do
   def_ash_error([:message, :value, :context], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_filter_value"
 
diff --git a/lib/ash/error/query/invalid_limit.ex b/lib/ash/error/query/invalid_limit.ex
index 6ca72538..6f952c23 100644
--- a/lib/ash/error/query/invalid_limit.ex
+++ b/lib/ash/error/query/invalid_limit.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidLimit do
   def_ash_error([:limit], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_limit"
 
diff --git a/lib/ash/error/query/invalid_load.ex b/lib/ash/error/query/invalid_load.ex
index 0c0e5b28..470ab92b 100644
--- a/lib/ash/error/query/invalid_load.ex
+++ b/lib/ash/error/query/invalid_load.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidLoad do
   def_ash_error([:load], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_load"
 
diff --git a/lib/ash/error/query/invalid_sort_order.ex b/lib/ash/error/query/invalid_sort_order.ex
index a72dde4b..f72f4514 100644
--- a/lib/ash/error/query/invalid_sort_order.ex
+++ b/lib/ash/error/query/invalid_sort_order.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidSortOrder do
   def_ash_error([:order], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_sort_order"
 
diff --git a/lib/ash/error/query/no_read_action.ex b/lib/ash/error/query/no_read_action.ex
index 147d25a0..74108283 100644
--- a/lib/ash/error/query/no_read_action.ex
+++ b/lib/ash/error/query/no_read_action.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoReadAction do
   def_ash_error([:resource, :when], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_read_action"
 
diff --git a/lib/ash/error/query/no_such_attribute.ex b/lib/ash/error/query/no_such_attribute.ex
index 24772073..74f4c15e 100644
--- a/lib/ash/error/query/no_such_attribute.ex
+++ b/lib/ash/error/query/no_such_attribute.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchAttribute do
   def_ash_error([:resource, :name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_attribute"
 
diff --git a/lib/ash/error/query/no_such_attribute_or_relationship.ex b/lib/ash/error/query/no_such_attribute_or_relationship.ex
index 387aab4c..7ed8a52f 100644
--- a/lib/ash/error/query/no_such_attribute_or_relationship.ex
+++ b/lib/ash/error/query/no_such_attribute_or_relationship.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchAttributeOrRelationship do
   def_ash_error([:attribute_or_relationship, :resource], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_attribute_or_relationship"
 
diff --git a/lib/ash/error/query/no_such_filter_predicate.ex b/lib/ash/error/query/no_such_filter_predicate.ex
index 23a296a6..c3144ef5 100644
--- a/lib/ash/error/query/no_such_filter_predicate.ex
+++ b/lib/ash/error/query/no_such_filter_predicate.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchFilterPredicate do
   def_ash_error([:message, :value, :key, :resource], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_filter_predicate"
 
diff --git a/lib/ash/error/query/no_such_function.ex b/lib/ash/error/query/no_such_function.ex
index 2dcb7e3e..56b3805e 100644
--- a/lib/ash/error/query/no_such_function.ex
+++ b/lib/ash/error/query/no_such_function.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchFunction do
   def_ash_error([:name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_function"
 
diff --git a/lib/ash/error/query/no_such_operator.ex b/lib/ash/error/query/no_such_operator.ex
index 1b72b9c6..65896948 100644
--- a/lib/ash/error/query/no_such_operator.ex
+++ b/lib/ash/error/query/no_such_operator.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchOperator do
   def_ash_error([:name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_operator"
 
diff --git a/lib/ash/error/query/no_such_relationship.ex b/lib/ash/error/query/no_such_relationship.ex
index 891c6b09..374480a9 100644
--- a/lib/ash/error/query/no_such_relationship.ex
+++ b/lib/ash/error/query/no_such_relationship.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NoSuchRelationship do
   def_ash_error([:resource, :name], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_relationship"
 
diff --git a/lib/ash/error/query/not_found.ex b/lib/ash/error/query/not_found.ex
index 051f7824..2886c42e 100644
--- a/lib/ash/error/query/not_found.ex
+++ b/lib/ash/error/query/not_found.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.NotFound do
   def_ash_error([:primary_key, :resource], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "not_found"
 
diff --git a/lib/ash/error/query/offset.ex b/lib/ash/error/query/offset.ex
index 22f978be..0a593e00 100644
--- a/lib/ash/error/query/offset.ex
+++ b/lib/ash/error/query/offset.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.InvalidOffset do
   def_ash_error([:offset], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_offset"
 
diff --git a/lib/ash/error/query/read_action_required.ex b/lib/ash/error/query/read_action_required.ex
index 82d3640c..0766729c 100644
--- a/lib/ash/error/query/read_action_required.ex
+++ b/lib/ash/error/query/read_action_required.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.ReadActionRequired do
   def_ash_error([:resource], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "read_action_required"
 
diff --git a/lib/ash/error/query/required.ex b/lib/ash/error/query/required.ex
index 76961291..edf09370 100644
--- a/lib/ash/error/query/required.ex
+++ b/lib/ash/error/query/required.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.Required do
   def_ash_error([:field, :type], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "query_required"
 
diff --git a/lib/ash/error/query/unsortable_field.ex b/lib/ash/error/query/unsortable_field.ex
index efe95df2..db32a52c 100644
--- a/lib/ash/error/query/unsortable_field.ex
+++ b/lib/ash/error/query/unsortable_field.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.UnsortableAttribute do
   def_ash_error([:field], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "unsortable_field"
 
diff --git a/lib/ash/error/query/unsupported_predicate.ex b/lib/ash/error/query/unsupported_predicate.ex
index 8b2b9786..d07885c1 100644
--- a/lib/ash/error/query/unsupported_predicate.ex
+++ b/lib/ash/error/query/unsupported_predicate.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Query.UnsupportedPredicate do
   def_ash_error([:resource, :predicate, :type], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "unsupported_predicate"
 
diff --git a/lib/ash/error/side_load/invalid_query.ex b/lib/ash/error/side_load/invalid_query.ex
index d38aec2b..050ba871 100644
--- a/lib/ash/error/side_load/invalid_query.ex
+++ b/lib/ash/error/side_load/invalid_query.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.SideLoad.InvalidQuery do
   def_ash_error([:query, :side_load_path], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "invalid_side_load_query"
 
diff --git a/lib/ash/error/side_load/no_such_relationship.ex b/lib/ash/error/side_load/no_such_relationship.ex
index 27328462..9e637207 100644
--- a/lib/ash/error/side_load/no_such_relationship.ex
+++ b/lib/ash/error/side_load/no_such_relationship.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.SideLoad.NoSuchRelationship do
   def_ash_error([:resource, :relationship, :side_load_path], class: :invalid)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "no_such_side_load_relationship"
 
diff --git a/lib/ash/error/unknown.ex b/lib/ash/error/unknown.ex
index 559d84c0..bf0e34f3 100644
--- a/lib/ash/error/unknown.ex
+++ b/lib/ash/error/unknown.ex
@@ -5,7 +5,7 @@ defmodule Ash.Error.Unknown do
   def_ash_error([:errors, :error, :stacktraces?], class: :unknown)
 
   defimpl Ash.ErrorKind do
-    def id(_), do: Ecto.UUID.generate()
+    def id(_), do: Ash.UUID.generate()
 
     def code(_), do: "unknown"
 
diff --git a/test/actions/read_test.exs b/test/actions/read_test.exs
index 2e18f29d..08998b6f 100644
--- a/test/actions/read_test.exs
+++ b/test/actions/read_test.exs
@@ -46,7 +46,7 @@ defmodule Ash.Test.Actions.ReadTest do
 
     attributes do
       uuid_primary_key :id
-      attribute :uuid, :uuid, default: &Ecto.UUID.generate/0
+      attribute :uuid, :uuid, default: &Ash.UUID.generate/0
       attribute :title, :string
       attribute :contents, :string
     end
@@ -86,7 +86,7 @@ defmodule Ash.Test.Actions.ReadTest do
     end
 
     test "it returns nil when there is no matching record" do
-      assert {:ok, nil} = Api.get(Post, Ecto.UUID.generate())
+      assert {:ok, nil} = Api.get(Post, Ash.UUID.generate())
     end
 
     test "it uses identities if they exist", %{post: post} do
diff --git a/test/filter/filter_test.exs b/test/filter/filter_test.exs
index 7c51b997..81b7cc36 100644
--- a/test/filter/filter_test.exs
+++ b/test/filter/filter_test.exs
@@ -412,8 +412,8 @@ defmodule Ash.Test.Filter.FilterTest do
     end
 
     test "understands relationship filter subsets" do
-      id1 = Ecto.UUID.generate()
-      id2 = Ecto.UUID.generate()
+      id1 = Ash.UUID.generate()
+      id2 = Ash.UUID.generate()
       filter = Filter.parse!(Post, author1: [id: [in: [id1, id2]]])
 
       candidate = Filter.parse!(Post, author1: id1)
@@ -422,8 +422,8 @@ defmodule Ash.Test.Filter.FilterTest do
     end
 
     test "understands relationship filter subsets when a value coincides with the join field" do
-      id1 = Ecto.UUID.generate()
-      id2 = Ecto.UUID.generate()
+      id1 = Ash.UUID.generate()
+      id2 = Ash.UUID.generate()
       filter = Filter.parse!(Post, author1: [id: [in: [id1, id2]]])
 
       candidate = Filter.parse!(Post, author1_id: id1)