diff --git a/migrations/schema-orioledb-17.sql b/migrations/schema-orioledb-17.sql
index f28dc9a2e..531970c37 100644
--- a/migrations/schema-orioledb-17.sql
+++ b/migrations/schema-orioledb-17.sql
@@ -24,6 +24,13 @@ CREATE SCHEMA auth;
 CREATE SCHEMA extensions;
 
 
+--
+-- Name: graphql; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA graphql;
+
+
 --
 -- Name: graphql_public; Type: SCHEMA; Schema: -; Owner: -
 --
@@ -94,6 +101,20 @@ CREATE EXTENSION IF NOT EXISTS orioledb WITH SCHEMA public;
 COMMENT ON EXTENSION orioledb IS 'OrioleDB -- the next generation transactional engine';
 
 
+--
+-- Name: pg_graphql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS pg_graphql WITH SCHEMA graphql;
+
+
+--
+-- Name: EXTENSION pg_graphql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION pg_graphql IS 'pg_graphql: GraphQL support';
+
+
 --
 -- Name: pg_stat_statements; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -484,39 +505,6 @@ $_$;
 COMMENT ON FUNCTION extensions.set_graphql_placeholder() IS 'Reintroduces placeholder function for graphql_public.graphql';
 
 
---
--- Name: graphql(text, text, jsonb, jsonb); Type: FUNCTION; Schema: graphql_public; Owner: -
---
-
-CREATE FUNCTION graphql_public.graphql("operationName" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb) RETURNS jsonb
-    LANGUAGE plpgsql
-    AS $$
-    DECLARE
-        server_version float;
-    BEGIN
-        server_version = (SELECT (SPLIT_PART((select version()), ' ', 2))::float);
-
-        IF server_version >= 14 THEN
-            RETURN jsonb_build_object(
-                'errors', jsonb_build_array(
-                    jsonb_build_object(
-                        'message', 'pg_graphql extension is not enabled.'
-                    )
-                )
-            );
-        ELSE
-            RETURN jsonb_build_object(
-                'errors', jsonb_build_array(
-                    jsonb_build_object(
-                        'message', 'pg_graphql is only available on projects running Postgres 14 onwards.'
-                    )
-                )
-            );
-        END IF;
-    END;
-$$;
-
-
 --
 -- Name: get_auth(text); Type: FUNCTION; Schema: pgbouncer; Owner: -
 --
@@ -625,7 +613,7 @@ CREATE FUNCTION vault.secrets_encrypt_secret_secret() RETURNS trigger
 
 SET default_tablespace = '';
 
-SET default_table_access_method = heap;
+SET default_table_access_method = orioledb;
 
 --
 -- Name: audit_log_entries; Type: TABLE; Schema: auth; Owner: -
diff --git a/nix/tools/dbmate-tool.sh.in b/nix/tools/dbmate-tool.sh.in
index b7aa0d26e..b41e83f0b 100644
--- a/nix/tools/dbmate-tool.sh.in
+++ b/nix/tools/dbmate-tool.sh.in
@@ -156,7 +156,7 @@ trim_schema() {
 }
 overmind_start() {
         cat > Procfile << EOF
-postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" "$PSQL_VERSION"
+postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations
 EOF
     overmind start -D
     echo "Waiting for overmind socket..."