Agreed. In fact, the ubiquity and effectiveness of surveillance technology today makes Stallman's "massive surveillance" argument seem stale.
These days, government surveillance is just a drop in the bucket. Surveillance by private companies and private citizens dwarfs it.