diff --git a/apps/backend/pkg/repo/repo.go b/apps/backend/pkg/repo/repo.go
index cc88a302..979821f4 100644
--- a/apps/backend/pkg/repo/repo.go
+++ b/apps/backend/pkg/repo/repo.go
@@ -12,7 +12,7 @@ import (
 	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 	"golang.org/x/crypto/bcrypt"
 
-	orm "github.com/crlssn/getstronger/apps/backend/pkg/orm"
+	"github.com/crlssn/getstronger/apps/backend/pkg/orm"
 )
 
 type Repo struct {
diff --git a/apps/backend/pkg/test/testdb/factory_routine.go b/apps/backend/pkg/test/testdb/factory_routine.go
index 6c71a269..10108844 100644
--- a/apps/backend/pkg/test/testdb/factory_routine.go
+++ b/apps/backend/pkg/test/testdb/factory_routine.go
@@ -21,7 +21,7 @@ func (f *Factory) NewRoutine(opts ...RoutineOpt) *orm.Routine {
 		Title:         "",
 		CreatedAt:     time.Time{},
 		DeletedAt:     null.Time{},
-		ExerciseOrder: null.JSON{},
+		ExerciseOrder: nil,
 	}
 
 	for _, opt := range opts {
@@ -59,6 +59,6 @@ func RoutineExerciseOrder(exerciseIDs []string) RoutineOpt {
 		if err != nil {
 			panic(fmt.Errorf("failed to marshal exercise order: %w", err))
 		}
-		m.ExerciseOrder = null.JSONFrom(bytes)
+		m.ExerciseOrder = bytes
 	}
 }