diff --git a/api/api.go b/api/api.go
index d867bbd..342fe38 100644
--- a/api/api.go
+++ b/api/api.go
@@ -23,8 +23,7 @@ import (
 )
 
 type API struct {
-	db   *sql.DB
-	exec bob.Executor
+	db bob.Executor
 
 	scheduler   *cron.Cron
 	scheduleMap map[cron.EntryID]*models.Subreddit
@@ -78,8 +77,7 @@ func New(deps Dependencies) *API {
 		panic(err)
 	}
 	api := &API{
-		db:                 deps.DB,
-		exec:               bob.New(deps.DB),
+		db:                 bob.New(deps.DB),
 		scheduler:          cron.New(),
 		scheduleMap:        make(map[cron.EntryID]*models.Subreddit, 8),
 		downloadBroadcast:  broadcast.NewRelay[bmessage.ImageDownloadMessage](),
@@ -96,7 +94,7 @@ func New(deps Dependencies) *API {
 }
 
 func (api *API) StartScheduler(ctx context.Context) error {
-	subreddits, err := models.Subreddits.Query(ctx, api.exec, nil).All()
+	subreddits, err := models.Subreddits.Query(ctx, api.db, nil).All()
 	if err != nil {
 		return errs.Wrapw(err, "failed to get all subreddits")
 	}
diff --git a/api/devices_create.go b/api/devices_create.go
index ff02bb0..a3bd419 100644
--- a/api/devices_create.go
+++ b/api/devices_create.go
@@ -15,7 +15,7 @@ func (api *API) DevicesCreate(ctx context.Context, params *DeviceCreateParams) (
 	ctx, span := tracer.Start(ctx, "*API.DevicesCreate")
 	defer span.End()
 
-	device, err := models.Devices.Insert(ctx, api.exec, params)
+	device, err := models.Devices.Insert(ctx, api.db, params)
 	if err != nil {
 		var sqliteErr sqlite3.Error
 		if errors.As(err, &sqliteErr) {
diff --git a/api/devices_list.go b/api/devices_list.go
index 42eac4b..d52f60d 100644
--- a/api/devices_list.go
+++ b/api/devices_list.go
@@ -68,12 +68,12 @@ func (api *API) DevicesList(ctx context.Context, params DevicesListParams) (resu
 	ctx, span := tracer.Start(ctx, "*API.DevicesList")
 	defer span.End()
 
-	result.Devices, err = models.Devices.Query(ctx, api.exec, params.Query()...).All()
+	result.Devices, err = models.Devices.Query(ctx, api.db, params.Query()...).All()
 	if err != nil {
 		return result, errs.Wrapw(err, "failed to query devices", "params", params)
 	}
 
-	result.Total, err = models.Devices.Query(ctx, api.exec, params.CountQuery()...).Count()
+	result.Total, err = models.Devices.Query(ctx, api.db, params.CountQuery()...).Count()
 	if err != nil {
 		return result, errs.Wrapw(err, "failed to count devices", "params", params)
 	}
diff --git a/api/devices_update.go b/api/devices_update.go
index 4168686..0ea22e4 100644
--- a/api/devices_update.go
+++ b/api/devices_update.go
@@ -13,7 +13,7 @@ func (api *API) DevicesUpdate(ctx context.Context, id int, update *models.Device
 	ctx, span := tracer.Start(ctx, "*API.DevicesUpdate")
 	defer span.End()
 
-	err = models.Devices.Update(ctx, api.exec, update, &models.Device{ID: int32(id)})
+	err = models.Devices.Update(ctx, api.db, update, &models.Device{ID: int32(id)})
 	if err != nil {
 		var sqliteErr sqlite3.Error
 		if errors.As(err, &sqliteErr) {
diff --git a/api/download_subreddit_images.go b/api/download_subreddit_images.go
index e754663..12e18d5 100644
--- a/api/download_subreddit_images.go
+++ b/api/download_subreddit_images.go
@@ -240,7 +240,7 @@ func (api *API) isImageExists(ctx context.Context, post reddit.Post, device *mod
 		return false
 	}
 
-	_, err := models.Images.Query(ctx, api.exec,
+	_, err := models.Images.Query(ctx, api.db,
 		models.SelectWhere.Images.DeviceID.EQ(device.ID),
 		models.SelectWhere.Images.PostID.EQ(post.GetID()),
 	).One()
diff --git a/api/pubsub_download.go b/api/pubsub_download.go
index 64452ba..295b0de 100644
--- a/api/pubsub_download.go
+++ b/api/pubsub_download.go
@@ -26,13 +26,13 @@ func (api *API) startSubredditDownloadPubsub(messages <-chan *message.Message) {
 			subredditName := string(msg.Payload)
 			span.SetAttributes(attribute.String("subreddit", subredditName))
 
-			subreddit, err := models.Subreddits.Query(ctx, api.exec, models.SelectWhere.Subreddits.Name.EQ(subredditName)).One()
+			subreddit, err := models.Subreddits.Query(ctx, api.db, models.SelectWhere.Subreddits.Name.EQ(subredditName)).One()
 			if err != nil {
 				log.New(ctx).Err(err).Error("failed to find subreddit", "subreddit", subredditName)
 				return
 			}
 
-			devices, err := models.Devices.Query(ctx, api.exec).All()
+			devices, err := models.Devices.Query(ctx, api.db).All()
 			if err != nil {
 				log.New(ctx).Err(err).Error("failed to query devices")
 				return
diff --git a/api/subreddits_list.go b/api/subreddits_list.go
index 4a3ec10..e20ad98 100644
--- a/api/subreddits_list.go
+++ b/api/subreddits_list.go
@@ -56,12 +56,12 @@ func (api *API) ListSubreddits(ctx context.Context, arg ListSubredditsParams) (r
 	ctx, span := tracer.Start(ctx, "api.ListSubreddits")
 	defer span.End()
 
-	result.Data, err = models.Subreddits.Query(ctx, api.exec, arg.Query()...).All()
+	result.Data, err = models.Subreddits.Query(ctx, api.db, arg.Query()...).All()
 	if err != nil {
 		return result, errs.Wrapw(err, "failed to list subreddits", "query", arg)
 	}
 
-	result.Total, err = models.Subreddits.Query(ctx, api.exec, arg.CountQuery()...).Count()
+	result.Total, err = models.Subreddits.Query(ctx, api.db, arg.CountQuery()...).Count()
 	if err != nil {
 		return result, errs.Wrapw(err, "failed to count subreddits", "query", arg)
 	}