I'd check out american cyclery in san francisco. They've got soma bikes, and can get you a surly if you'd prefer that. I believe the missing link in berkeley and the freewheel in san francisco also have surlys.
After test-riding both, i ended up with a soma double-cross instead of a cross-check.