diff --git a/crates/artifact/src/lib.rs b/crates/artifact/src/lib.rs
index 1d2b83d..629ced5 100644
--- a/crates/artifact/src/lib.rs
+++ b/crates/artifact/src/lib.rs
@@ -101,14 +101,14 @@ impl Artifact for PublicArtifact {
     }
   }
   async fn download(&mut self) -> Result<()> {
-    let object_store = Box::new(|| Self::object_store());
+    let object_store = Box::new(Self::object_store);
     self.contents =
       Some(download_artifact(object_store, &self.id.0.to_string()).await?);
 
     Ok(())
   }
   async fn upload(&self) -> Result<()> {
-    let object_store = Box::new(|| Self::object_store());
+    let object_store = Box::new(Self::object_store);
     upload_artifact(
       object_store,
       &self.id.0.to_string(),
@@ -140,14 +140,14 @@ impl Artifact for PrivateArtifact {
     Self { id, contents }
   }
   async fn download(&mut self) -> Result<()> {
-    let object_store = Box::new(|| Self::object_store());
+    let object_store = Box::new(Self::object_store);
     self.contents =
       Some(download_artifact(object_store, &self.id.0.to_string()).await?);
 
     Ok(())
   }
   async fn upload(&self) -> Result<()> {
-    let object_store = Box::new(|| Self::object_store());
+    let object_store = Box::new(Self::object_store);
     upload_artifact(
       object_store,
       &self.id.0.to_string(),
diff --git a/crates/site-app/src/components/photo_upload.rs b/crates/site-app/src/components/photo_upload.rs
index 78a07db..689ed7b 100644
--- a/crates/site-app/src/components/photo_upload.rs
+++ b/crates/site-app/src/components/photo_upload.rs
@@ -42,7 +42,7 @@ pub fn PhotoUpload() -> impl IntoView {
           <div class="d-form-control">
             <button
               type="submit" class="d-btn d-btn-primary w-full"
-              disabled={move || pending()}
+              disabled=pending
             >
               { move || if pending() { view!{ <span class="d-loading d-loading-spinner" /> }.into_view() } else { view! {}.into_view() } }
               "Upload"