If you are living in a place with bad road conditions and lots of potholes, I recommend for not replace your fork with rigid one to you. I have suspension fork with lock on my hybrid but I can use lock only at my recreational rides on seaside parks with good bicycle paths because in my city, nearly all of the roads like MTB paths.