diff --git a/internal/cmd/molecule.go b/internal/cmd/molecule.go
index 90a771c7..93f10b02 100644
--- a/internal/cmd/molecule.go
+++ b/internal/cmd/molecule.go
@@ -145,7 +145,7 @@ func init() {
 }
 
 func runMoleculeList(cmd *cobra.Command, args []string) error {
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findLocalBeadsDir()
 	if err != nil {
 		return fmt.Errorf("not in a beads workspace: %w", err)
 	}
@@ -288,7 +288,7 @@ func runMoleculeExport(cmd *cobra.Command, args []string) error {
 func runMoleculeShow(cmd *cobra.Command, args []string) error {
 	molID := args[0]
 
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findLocalBeadsDir()
 	if err != nil {
 		return fmt.Errorf("not in a beads workspace: %w", err)
 	}
@@ -382,7 +382,7 @@ func runMoleculeShow(cmd *cobra.Command, args []string) error {
 func runMoleculeParse(cmd *cobra.Command, args []string) error {
 	molID := args[0]
 
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findLocalBeadsDir()
 	if err != nil {
 		return fmt.Errorf("not in a beads workspace: %w", err)
 	}
@@ -462,7 +462,7 @@ func runMoleculeParse(cmd *cobra.Command, args []string) error {
 func runMoleculeInstantiate(cmd *cobra.Command, args []string) error {
 	molID := args[0]
 
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findLocalBeadsDir()
 	if err != nil {
 		return fmt.Errorf("not in a beads workspace: %w", err)
 	}
@@ -532,7 +532,7 @@ func runMoleculeInstantiate(cmd *cobra.Command, args []string) error {
 func runMoleculeInstances(cmd *cobra.Command, args []string) error {
 	molID := args[0]
 
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findLocalBeadsDir()
 	if err != nil {
 		return fmt.Errorf("not in a beads workspace: %w", err)
 	}
diff --git a/internal/cmd/statusline.go b/internal/cmd/statusline.go
index 8856d6fc..4a372dcc 100644
--- a/internal/cmd/statusline.go
+++ b/internal/cmd/statusline.go
@@ -133,7 +133,7 @@ func runMayorStatusLine(t *tmux.Tmux) error {
 // Fast path - returns 0 on any error.
 func getUnreadMailCount(identity string) int {
 	// Find workspace
-	workDir, err := findBeadsWorkDir()
+	workDir, err := findMailWorkDir()
 	if err != nil {
 		return 0
 	}