Amen to all those passages.Water baptism does not seem to be what Peter has in view in 1Peter 3:21. The English word "baptism" is simply a transliteration of the Greek word baptizo, which means "to immerse." Baptizo does not always refer to water baptism in the New Testament (cf. Matthew 3:11; Mark 1:8; 7:4; 10:38-39; Luke 3:16; 11:38; 12:50; John 1:33; Acts 1:5; 11:16; 1 Corinthians 10:2; 12:13). Peter is not talking about immersion in water, as the phrase "not the removal of dirt from the flesh" indicates. He is referring to immersion in Christ's death and resurrection through "an appeal to God for a good conscience," or repentance.
Please list the passages that only talk about water baptism.